Final Changes for Sprint 1