some tweaks to match logic %