More assignment 2, part 2