Looking to update and optimise my workflow