Others modifications