New containment method.
Bugfix the new setup.
One more bugfix.