Instead of scheduler task, use join event