FIX to work with huge topo (in progress)