update CHANGES
modify logic a little