move to improved p2 functions
1 file changed