Added code from hw2