v2 additional tweaks