comments rework