Bug fixes with naming the new file