Sprint 5 final changes