Improved mode computation