Add logic to shuffle options