finished beta v2