More progress on the demo