beta version almost ready