Code Refactored
Merge with Eldar Damari