More general work and Vex fixing