More safety checks on edges
Rebuild