update from jinlong's catanalysis