Modified the way jobs run