updated before demo