refactoring reperformed after being overwritten by revert