added or substituted component term where it makes sense