updated w/ q6 and 5