orrespondance logic change