Changes after first review by bruno