Change handling.
Fix functionality.