Finishing up Q series optimization