corrections/simplify job2 from cellix