offline mode improved