Sort Changes properly