Corrected P19, added P20