Optimization on ROHighlight. Thanks to Benjamin