Q6 removed some comments