updates from Goncarlo Gomez