some changes to connectWith