update for emily and olives beta2