Working reorganization of input steps