final version before demo