incorporate corrections from Emeline