Modified user_client/base