Updated repo to match June 20th changes