final fix for ui and reachability