Getting ready for 2006 integration