Minor Function and 'Repeat' Option added