fixed updateandsolve sort of