Update to Beta2 w/ new changes