Updated Input - need to test