Jobid v3

Update based on v2 to address Andreas' comments.