Added timeouts to Joiner and Joinent