Added options for not using PIR2