Changes to the design and ETLs of Sprint 3