Moved Connected-Event to Switch-Event to be more reliable.