update build for S4 support