Updated to handle S2 and S3.