Demo 2 updates