finished beta 1.0