Added in vars for file names