Replace shape with geometry (rebased)