adds changes that pass 18 of 20 tests