Simpler pS and pG updates