Reordered some change check functions