Fixed Jobs to correctly generate now