Update the echo code to actually work