Added second arg option