Replaced CBA shuffle with own shuffle algorithm.
Fixed wrong function call.