Some restructuring of coords.