done before demo