Reworked workflow steps