Added more blocks, fixed shuffling