Removed hardcoded filepaths