Version with fixes after demo