change the view according to Tims suggestion