partial modifications from Carmen's suggestions