Moved conditional connector statement.
Removed condition on connector.

This is done to ensure consistency with the use of this connector in other models.
Removed condition on connector.

This is done to ensure consistency with the use of this connector in other models.