Updated according to new view changes