changed spatial field from geometry to Shape