some debugging done, mainly based on the steps restructuring