Add P, S0, S1 and such