Charles' additions/changes