Updated View to Work