Updated score calculations