last minutes changes just before demo… check!