Added more business logic