- switched from enclosements to intersections
- improved repositioning