Temp solution for TIR support with RW5 ?