Actually fixed W and S.