Started code refactoring
Logic of adding new steps instead of old steps
Logic of adding new steps instead of old steps