Began changes for S3 ranked architecture