I use Mac Office 2008 on my Macbook Pro. I’ve been looking into getting Endnote for quite some time, but noted all the problems you were having with Cite While You Write and as such held off. I noticed today that this have been corrected with a patch. However, will the X2 version of endnote for Mac be released soon? If I were to buy the X1 version now, would the X2 version be a free upgrade?