Move to eventHandler instead of creating a new thread every time