updated to work with one definition file...