q6 edited and completed