NOT A USABLE COMMIT ; Mild adjustment pass connect callback instead of mapping 'registered' event manually