Latest Changes

tested and working on dojo 143 and 180,