add all bagyusz changes and OMNI-fy