Main Job reworked