changes for containment option.