incorporating Camiel's suggestions