Fixed up GS solver for new datavector