added location and time