all input now working