Tentative Q6 implementation done