Back to using ShapeManager just in case