need to move to model