Updating to latest Gaia #6