Update and rename empty to Poly_Boundary