Got rid of my random S3 code