Adding Joaquin's requested changes.