Adding changes from Eric and Caro these last two weeks