Moved all inputs to params