Overlay changes to sync with Omni