Made some changes in the logic and repository layer...