v4 tweaks