Changed where the input is gotten from