Updating to latest Gaia #4