update to match rydurham's feedback