Improved astrometry section