Add q6 APE7
Minor lisibility improvement to q2 APE4