Update of the general file: more variables
Merge