Update the steps to avoid recusion issue