refactored; added 2004-2007