upgrading to latest Emily/Olives