More demo code updates.