removed logic to Model