You should merge this class with the class above