change to my s4-common tree too