Refactored 116C