Big update. Close to Beta 1