Moved all over to new input