Improve shuffler