finished beta1.1