change to s4-common