Moving the class back