Changed 4 files to swap the order of 2 lines