Changes after comments from Romolo