update to support polyshapes.