Added the ability to have repeating options