more work on cum diag stuff