Updated score calculation