some updates to s1