These figures included the four Scharnhorst- and Bismarck-class battleships already built or building, the three Deutschland-class panzerschiffe and the six light cruisers already in service.[11] To complete the core of the Plan Z fleet, six H-class battleships, three O-class battlecruisers, twelve P-class panzerschiffe, and two Graf Zeppelin-class aircraft carriers with two more of a new design, were to be built.[18][19] The five ships of the Admiral Hipper class fulfilled the mandate for heavy cruisers, while the M class of light cruisers would fulfill the requirement for light cruisers.[20] The Spähkreuzer 1938 design would form the basis for the fleet scouts ordered in the program.[21] On 27 July 1939, Raeder revised the plan to cancel all twelve of the P-class panzerschiffe.[19]