Updates by GAPAFOT