Added some extra features to hw2p2