Added some extra steps to workflow