Beta rework

NEXT