Changes for multipile inputs, etc.