adding behaviour to events fix #3 fix #4