Considering switch state for johlize