Pooja/Ajay | #3562 | Refactored JS