move to improved p2 functions
2 files changed