edit refactor ongoing