Added off-line detection & read stored data