table corrected to be more general