Modify event (screen part)
Fix merge conflicts