Refactoring, added event-watch.html