Updated to keep changed viewpoints