Improved stability and highlighting