fixed all except for q6