Update for non Eigen users