Added variables for filepaths