More work on avoiding internet requests in status