Improved geometry