support for offline shoudl also work