tweaking names and adding Kyle's feedback