Minor improvements to P09. Implemented P13.