Changes to make the program run (correct result is not yet)