merged
modified job structure
merged stuff