minor changes before demo