added changes in both files