adding location and stuff