Patch 1

Read the file name.

 Plus, in long term these would be needed, I Think