Improved mode feature.