Updated tutorial-exercise to match the current implementation