Changes to the business logic