Adding original workflow stuff to the mix