Master Job reorganization
update