Adding code for all steps