updates after review by martijn