Are the changes in this class supposed to be here?