hw2p2 updated controller and index