Final update before demo 3