Updated for new work boxes
Cope with 'git dif' typos