last update before demo 2