Echo improvements