Combined changes from Joe & Joel