remaining changes commited