beta version - ready to tests