I would say yes, 3rd generation then. You should not have to do anything special then if this is the case. ENJOY!

George

P.S. I meant to say you don't need to the same mods that were required on the earlier birds. Sorry I can't help you with your existing problems.