Updated for view