[#1865] Faris - Refactored.