Ben, cody, and thoma's updates