incoporating Dominique Mereaux's feedback