Changed some steps in workflow