a little restructuring, saving correspondences should work now