updated for use with tbr 3.0.0