jnfass's additions, without truncated cases