added some changes in business logic