Incorporating fmarier's feedback