Removed Path & refactored