Applied Carmen's suggestions