rebased tweaks