improving before demo