refactor; also notices intermittent failures