modify the echo and comments