Merge with Eldar
- Code Refactored