move to improved p2 functions
10 files changed