Minor improvement to P09. Implemented P10.