Added further steps for entire workflow