added name and location