Modified first job, fix some jobIds