updating from the Erika merge