upstream better comments