Improved self containment