added empty states & reachability