updated without vivi