merge Steve's ud-replicate work