....just to correct your correction...
Its no longer 'RAF' Upavon as the RAF left in 1993 and the Army then moved in and renamed it Trenchard lines ..... but still commmonly referred to as '622 - Upavon'
I guess 622 Trenchard lines would be correct, but then most people would immediately ask ...where?
