added old branch changes which never made it (?)
Merge branch 'Joe'