What are the proposed changes?
Copying over all the final changes to incorporate for scoring as well as changes needed for utilizing userPreferences in the calculations
Justification for changes (if necessary).
Linked Issues
Mention any relevant issues. Include closing terms if necessary.
PR Description
Linked Issues