update from Ander Goes to Aveiro