removed more logic from the model