prepared to merge, hide beta features