Updated beta code