30 10 changes

Merging 30_10_changes to master