More progress on demo