Updated with non working internet connectivity check