updates after discussion with paul