Added inputs
Merge branch 'new-inputs'