Issue 1 solved. Changing to new files.