Ported pulling across zlevels from TG, also added span changes