incremental text updating - first version working
fixed merge conflicts