Move to S and T instead of P