Sprint 3 changes