Adopted the latest changes to Jon's beta