Started to add in fingerprinting