Will rename the method and improve the business logic as suggested