updated for patch system and Omni's upcoming soft dependency changes