Edited all jobs. Not Tested yet. Some need to be modified ...