[#1592] Faris : Refactored.