holoirc: refactor and reflect relay changes