Coded special case matrix, still need comments