Update 2

Added Jorge and Gianfranco's comments.