Update Refactored Code