p2s.sh adjusts functions too