Changes to both files