changed echo/cleaning