Ok, I'll do it after your refactoring merge.