merged in Ron/Dons latest changes

Resolved overwrite of some parts of file due to incomplete merge.