===The Tombstones===
Main Article: [[Haunted Mansion Tombstones]]
The original graveyard in the Haunted Mansion queue is still in place. After the 2010 refurbishment, stones marking the burial places of the hitchhiking ghosts were added. The headstones that paid homage to Marc Davis and X Atencio have been moved from the hillside to the middle of the interactive queue. Likewise, the tombstone marking the resting place of Master Gracey has been moved into the interactive queue.