3v3 improvements