Updated scoring algo