drop echo, missed some places