Changed to being mostly header checks.