made some changes to prepare for fingerprinting