add and delete comment full refucktoring