scoring fix, removed modal
merge