point & polygon modified