update S2* stuff