hopefully final replacement of all ids