Changed to new geometry r1086