Refactored Changes