Update with the latest omni stuff