Added partial verification, maybe?