incorporated Dave's feedback