made the whole shebang work in offline mode again