updated references to M07
hard coded data source name