improve memo to/from tracking