Did some refactoring and a new initialization event