Rewriting to use new hedtek resources