Updated with new scoring algorithm