updated from gaia master