Updates by SMAS Almada