make new message handle better and clear. add location.