restructured and added neighbor_id key