At the Marriott Waikiki, I was further upgraded from a junior suite to a suite with 2-bedroom, 1 1/2-bathroom suite with double balcony and dining table on the 24th floor. Not sure the category. Breakfast buffet is still very basic, despite the high cost. No fresh berries or fruit, other than melon and bananas. I ate breakfast one morning at the Moana Westin and another morning at the Laylow, Autograph Collection.