Made some changes with input