Made some more modifications to echo2.c