Move the changes to fingerprinting to the top