Updates by magid