Chris made changes to client model and view