working properly - filenames fixed