Update for better view