cleaned up echos