Updated to remove conforming container