Added name and location