sorting out containment issues...