Refactored_Working