Added no-repetition feature