More code reduced from CI_Table