Done Tianyuan's pilot analysis
Done my pilot analysis
Fix merge issues