Improve the echo's