implemented beta features