Implemented ability to close event