Many modifications and redesign abit of job-maker