Commit title: Improve the creation of the file

Description: