qs fixed and optimized

eqs was broken ? :-1: