more changes, I think I'm going to revert