This class looks a lot like my changes