(hopefully) final update for Sprint 1