add some more changes, but tests still fail