some more changes
Merge branch 'nick'