Use shorter paths