Ditch gen event as it's tricky to catch the connection event