Added the view change code back in.