fixed CHANGES
updated CHANGES
merged