inital commit Beta 6