more tweaks for obanyc-2024