finished beta version 1.1