Pushing updates from midterm demo