Added in more offline/online checks