move to improved p2 functions
8 files changed