Next step for adjacency fix