Adaptation of the original version of these files