Added extra comments to echoes