rewrote the comments