add event point and remove waste code.