modify event2 and testcode