6906: refactor