Updates by Divirod