Using generic location instead of filename, added updated