Ok, use Q for now and I'll look at it when I'll be merging.