Added a little echo stuff