updated offline behaviour