Undoing some changes we made during the demo last Wednesday