Make shuffleing optiona;