Added preliminary offline mode