Adapting for new geometry