hopefully the final mods for a working pipeline