changed romething in the master class