recoded some things and added job_change check