Made the echo checks a bit nicer