Added yhat adaptation. Not working yet.