updated using Connectivity framework