Doug's additions/changes