Update and rename q6 to q6_byAkash