connectivity handling is done. tentative final version