Can extract event and mark it

- Extract seperated into two functions