config updated according to latest changes
joining refactored