Changed part syntax and semantics to an input instead
Merge remote-tracking branch 'origin/master'