Mode improvements