Rewiring for move - part 1