Changes to get closer to my workflow