Changes for omni