fixed problems with shuffle and cut methods