Updated for job running