refactored the liney connectory thingies