adding hackery from previous bringup work