* Improving the performance of mode expansion.