Added p18, 19 (<- not correct yet)