Added non-connect setting