Daniel's master_file commit