Updated to reflect Domenic's feedback