Good idea, I'll do this in a new PR