added enforce connectivity