small adjustments to prepare storing of correspondences