some omitted changes