Upgrade to datafiles - part 5