Updated for new beta