Changed desgin and file generation lenght