Further adjustments to step workflow