Updates by uoitc