Lots of Willow Warblers calling

So I think this is one - bright yellow above the eye stripe and looks like long primary wing feathers so that's a Willow Warbler ( and not a Chiffchaff) - Am I correct ?