Rework for omni base