[IMP] Change the business logic