Move addInput() to better place