Fixed conditional
Added switch action