Thanks for your information--I was worried!
Regarding the rooms: we booked a Jr. Suite--I don't know which wing they are in or if they are in both.
We are staying in a very authentic Riad in Marrakech--Riad Kniza--and I thought the more modern might be a contrast. I could email and ask BUT I do know that sometimes a reservation can get screwed up when one starts changing things.
If you think the old rooms are great I will let it be.