new and more complete infrastructure file