BugFix
Soroosh
DS3
Latest changes to the code
DS3 finished