p2 - minor changes