Final changes Sprint 2