incorporated Paddy Foran's suggestions