Added shapeshift and zoomooz