Updates on the job logic