refactored containers + including collision