Code Refactored
- merge with eldar