move to improved p2 functions
3 files changed