Changes from Paul Hoffman