updated to work with the new location of these files