Updated after Class 2