Trying to improve the workflow