Now score calculation working