added rid for modular use