tweaks before Max's