Some changes following Sprint 8 demo discussions