Add join timer
fixup! Add join timer
fixup! fixup! Add join timer