Changes to fix the code