Fixed shuffling and added sliding