updated parts 2 and 3 of homework 3