Changes after discussion with Andreas