final changes to master before demo