Added random choice logic