Comments from @zpao