Major update before demo