Added p30, 31 and 32