Use MakeClass if "tabu" is selected
Added swap and limited trial times