Updates by fanab