More details on S3<->S4 changes