Updated the business logic