Additional Source: Wrestling Observer
Ric Flair seems to have ironed out his problems with WWE as he’s signed a new three year contract that will see him remain a full-time company employee after his retirement from the ring (expected to be at Wrestlemania 24). This will keep Flair with the company through 2010 (assuming he doesn’t quit or get released).