V1 final tweaks