Hmm...

I have to admit I like the old idea more that it got developed during Season 2 after the war...