Upgrade to datafiles - part 4