added location and type in comment