Upgrade to datafiles - part 3