Partially fixed input issue, have to test for more cases