Updated whole pipeline for cleaner running
Hopefully avoiding rebasing...