Update job

a little waterfall ? This is not easy to read, as there is functions in functions