[TG] First stab at better avoidance; not fully working