Reworked order input