updating from review, adding missing bonus question