ok, so ... refactoring of the steps inbound