More work on shuffler