First pass at new beta changes