final changes before demo