fixed out of order changes