Now can work with no Internet connection