todo fix connection crossings;