7-16-2007: refactored model