Upgrade to datafiles - part 6