Refactored
Updated