Adding 'infinite' option;