added bounding_box argument to shuffle