Changes made to scoring
Fixing merge conflicts
Added mutex for score