Simplification of $new_q value handling