corrected Cadair's suggestions