add two-dimensional scoring
add Move-sensitive scoring