Updates by FEUP and IPB