Better Q Casting

v1.6