#gklst added container for shapeshift