Working on new topic update. Needs fixing in the js.