Changes to the code