more halfway complete changes