move to improved p2 functions
4 files changed