updated combinatorics