Sri | Refactored on feedback