MB-81 #Removed old structure, added connection test