Improve q3