beta3 update

Updating to work with Beta3's API changes