Yeah we could. I'll do that in master after Code Freeze