updated S(q) calc.