Added modifier inputs.
Many changes.