dynamic refactor immediately