Comments from max li bin (@maxlibin)