removed the shuffle bullshit