Update to Omni - step II