Changes addresses to connections, makes more sense