yeah… I didn’t see an easy way for it, so I thought it would be better to split it from the original highlight PR so that that one won’t grow too much 🙈