refactored Events( just added setter )