6905: refactor