added scoring
merge