Small update
Rewritten to Event Args