[#1865] Godwin/Faris - Refactored.