Suraj || Refactored.