Some changes from Job
Some changes