refactoring missing some deltas but should be ok