Temporary Fix view 2