change echo/log handling, draft