uncommited latest version of coaddition code (I lost track of the changes here ... that's bad)