fixup! fixup! fixup! Add join timer