Changes on comment added and removed (Not Finished)