updated leave calculation and job position