added location to messages