UC-85 adding code back in b/c it might be getting used