Moved event back into initialize