CS: some test minor commit
1. WIP: statistics data preparation \n2. some minor changes