Update underground to be slightly more global