moving some inputs around