Added score calculations