Ajay | #2975 | Refactored method