removeNext and shuffle update :)