Working.
Merged Phillip's & Shahaf's work