Rewriting the fingerprinting part