addressing Bhuva's feedback