Adding location where needed