Make the previous commit compile and pass all the test cases