Added mixed mode highlighting for best of both worlds speed improvement