added missing stuff for s3 and s4