Updates for Sprint 1