I'll do it before it's merged