starting to work on event blocking mechanism
after merge