Modified to use new jobstep method