Refactored connection to use no args
Moved event back into plugin