somewhat better coverage (and not crashing as often)