Finalish Touches to workflow
more changes