Commit 3:
Some changes in the business logic