removed some more logic from model