Input works
Fixed merge