Updated according to new View changes