Changes to allow multiple jobs to run

Please review.