Make OMC faster

It was annoying.