New version before demo.