My week is coming up and my original unit was the Marina Building at the Pelican. Are these posts saying that my Marina Building is now the Villas? I was just there 2 years ago, and it appeared that the Villas were new. I thought my Marina Building was still there. Also, I received a call to say that I could upgrade to the Villas to a Junior Suite for $295. We're a little tight on money, but the Junior Suite looks more like a hotel room (no couch, kitchen). Is this worth it or should I save the money & stick to what I think is my original Marina Building studio M304?