Updated the template to my current workflow