Optimisations of selector - I think it works. Changes in oving3 had no gain iirc