integrate P2/cmawro implementation of scores into P3