Updates for demo 5