Switching to modular
formatting
fixup events