applied Carmen's suggestions