Make it Omni Compatible