refactoring + broadcast of answer changes wip