unnecessary custom binding removed
change mode enhancements