First try at shuffle update