Refactor ongoing.