re-work file format and location