Added production option, added order arg logic